x86 hvm: Use 'x' as parameter name for macros converting between

{vcpu,domain} and {vlapic,vpic,vrtc,hpet}. Completely avoids
accidental aliasing.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c
index 89af0b61eedbb6deeb64dc68c0b2a3ec805485b8..73eef72360e85f60a6c9d886d53e57db629b035c 100644 (file)
--- a/xen/arch/x86/hvm/hpet.c
+++ b/xen/arch/x86/hvm/hpet.c
@@ -24,11 +24,11 @@
 #include <xen/sched.h>
 #include <xen/event.h>
 
-#define domain_vhpet(d)    (&(d)->arch.hvm_domain.pl_time.vhpet)
-#define vcpu_vhpet(vcpu)   (domain_vhpet((vcpu)->domain))
-#define vhpet_domain(hpet) (container_of((hpet), struct domain, \
-                                         arch.hvm_domain.pl_time.vhpet))
-#define vhpet_vcpu(hpet)   (pt_global_vcpu_target(vhpet_domain(hpet)))
+#define domain_vhpet(x) (&(x)->arch.hvm_domain.pl_time.vhpet)
+#define vcpu_vhpet(x)   (domain_vhpet((x)->domain))
+#define vhpet_domain(x) (container_of((x), struct domain, \
+                                      arch.hvm_domain.pl_time.vhpet))
+#define vhpet_vcpu(x)   (pt_global_vcpu_target(vhpet_domain(x)))
 
 #define HPET_BASE_ADDRESS   0xfed00000ULL
 #define HPET_MMAP_SIZE      1024

diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
index 5394679a8e539cb9577e637b2e3b4f5a04e28a15..50c5493eb5006e02fea9ec4f4c72405991cb0015 100644 (file)
--- a/xen/arch/x86/hvm/i8254.c
+++ b/xen/arch/x86/hvm/i8254.c
@@ -38,11 +38,11 @@
 #include <asm/hvm/vpt.h>
 #include <asm/current.h>
 
-#define domain_vpit(d)   (&(d)->arch.hvm_domain.pl_time.vpit)
-#define vcpu_vpit(vcpu)  (domain_vpit((vcpu)->domain))
-#define vpit_domain(pit) (container_of((pit), struct domain, \
-                                       arch.hvm_domain.pl_time.vpit))
-#define vpit_vcpu(pit)   (pt_global_vcpu_target(vpit_domain(pit)))
+#define domain_vpit(x) (&(x)->arch.hvm_domain.pl_time.vpit)
+#define vcpu_vpit(x)   (domain_vpit((x)->domain))
+#define vpit_domain(x) (container_of((x), struct domain, \
+                                     arch.hvm_domain.pl_time.vpit))
+#define vpit_vcpu(x)   (pt_global_vcpu_target(vpit_domain(x)))
 
 #define RW_STATE_LSB 1
 #define RW_STATE_MSB 2

diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c
index 0128d02419d99add1441d8047048b7d751c553a4..174a111535060ef072b37b2b49dfed3b70a44127 100644 (file)
--- a/xen/arch/x86/hvm/rtc.c
+++ b/xen/arch/x86/hvm/rtc.c
@@ -28,11 +28,11 @@
 #include <asm/hvm/support.h>
 #include <asm/current.h>
 
-#define domain_vrtc(d)   (&(d)->arch.hvm_domain.pl_time.vrtc)
-#define vcpu_vrtc(vcpu)  (domain_vrtc((vcpu)->domain))
-#define vrtc_domain(rtc) (container_of((rtc), struct domain, \
-                                       arch.hvm_domain.pl_time.vrtc))
-#define vrtc_vcpu(rtc)   (pt_global_vcpu_target(vrtc_domain(rtc)))
+#define domain_vrtc(x) (&(x)->arch.hvm_domain.pl_time.vrtc)
+#define vcpu_vrtc(x)   (domain_vrtc((x)->domain))
+#define vrtc_domain(x) (container_of((x), struct domain, \
+                                     arch.hvm_domain.pl_time.vrtc))
+#define vrtc_vcpu(x)   (pt_global_vcpu_target(vrtc_domain(x)))
 
 static void rtc_periodic_cb(struct vcpu *v, void *opaque)
 {

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 1f42a60591287ae05e6da6a735fd46cb59f519cf..585b4c9014dbb7cabb09bc32a77d209b17ea3422 100644 (file)
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -460,7 +460,7 @@ int vlapic_ipi(
 
     if ( delivery_mode == APIC_DM_LOWEST )
     {
-        target = apic_lowest_prio(vlapic_domain(v), lpr_map);
+        target = apic_lowest_prio(vlapic_domain(vlapic), lpr_map);
         if ( target != NULL )
             rc = vlapic_accept_irq(vlapic_vcpu(target), delivery_mode,
                                    vector, level, trig_mode);

diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h
index 64979a7668bd480b61b4f7459934bcafac4c0331..3a5fe00bffdedefbb7238ad69513f129f6c70a0f 100644 (file)
--- a/xen/include/asm-x86/hvm/vlapic.h
+++ b/xen/include/asm-x86/hvm/vlapic.h
@@ -28,10 +28,9 @@
 
 #define MAX_VECTOR      256
 
-#define vcpu_vlapic(vcpu)   (&(vcpu)->arch.hvm_vcpu.vlapic)
-#define vlapic_vcpu(vpic)   (container_of((vpic), struct vcpu, \
-                                          arch.hvm_vcpu.vlapic))
-#define vlapic_domain(vpic) (vlapic_vcpu(vlapic)->domain)
+#define vcpu_vlapic(x)   (&(x)->arch.hvm_vcpu.vlapic)
+#define vlapic_vcpu(x)   (container_of((x), struct vcpu, arch.hvm_vcpu.vlapic))
+#define vlapic_domain(x) (vlapic_vcpu(x)->domain)
 
 #define VLAPIC_ID(vlapic)   \
     (GET_xAPIC_ID(vlapic_get_reg((vlapic), APIC_ID)))